Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: flag to toggle billed amy update in DN for Credit Note (backport #37879) #37924

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 6, 2023

This is an automatic backport of pull request #37879 done by Mergify.
Cherry-pick of a3191f1 has failed:

On branch mergify/bp/version-14-hotfix/pr-37879
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit a3191f1c8c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/sales_invoice/sales_invoice.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit a3191f1)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-14-hotfix/pr-37879 branch from 99afd69 to 71ad448 Compare November 6, 2023 04:10
@ruthra-kumar ruthra-kumar merged commit 932d1e7 into version-14-hotfix Nov 6, 2023
8 of 9 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-37879 branch November 6, 2023 05:54
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.47.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants